fix: treat null classifier as empty string in OverlayManager - #627
Open
elharo wants to merge 2 commits into
Open
fix: treat null classifier as empty string in OverlayManager#627elharo wants to merge 2 commits into
elharo wants to merge 2 commits into
Conversation
Objects.toString(x) converts null to the literal string "null", rather than "". This caused overlay-to-artifact matching to fail when one side had a null classifier and the other had an empty string, contradicting the documented MWAR-241 intent. Fixes apache#621
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes overlay-to-artifact matching in OverlayManager by ensuring null classifiers are treated the same as empty-string classifiers (per MWAR-241), preventing false mismatches caused by Objects.toString(null) producing the literal "null".
Changes:
- Update classifier comparison logic to normalize
nullclassifiers to""for both overlay and artifact. - Add a regression test covering the null-vs-empty classifier matching scenario.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java | Normalizes null classifier values to "" during overlay/artifact classifier comparison to avoid "null" literal mismatches. |
| src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java | Adds a regression test to ensure a null-classifier overlay can match an empty-classifier WAR artifact. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+141
to
+145
| OverlayManager manager = | ||
| new OverlayManager(overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, currentProjectOverlay); | ||
| assertNotNull(manager.getOverlays()); | ||
| assertEquals(2, manager.getOverlays().size()); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #621
Objects.toString(x)convertsnullto the literal string"null", not"". This caused overlay-to-artifact matching to fail when one side had a null classifier and the other had an empty string, contradicting the documented MWAR-241 intent.Includes TDD: wrote failing test (null-classifier overlay vs empty-classifier artifact throws
InvalidOverlayConfigurationException), then applied the fix.